package org.example;

public class Main {
    public static void main(String[] args) {

        System.out.println("Hello world!");
        System.out.println("Branch的修改");
        System.out.println("合并后在主线上的修改");

        System.out.println("冲突合并后在更新");
    }
}